Fixing tests
Merge pull request #220 from NuCivic/fixing_tests

Fixing tests