DAR-730 Removed special cases for dev environment.
DAR-730 Some improvements to unit tests.