Improve Testing infrastructure for ERT

[anighanta]

Currently there are no Integration tests at all for this repo.
We need better testing for ERT to avoid failures like #178

1. Increase unit test coverage
2. Add Integration tests
3. Add E2E tests.