EG-1743 - allows TeamCity to run, pass all tests

Both TeamCity and CircleCI report 100% coverage with these changes. They also allow TeamCity to run without failure.