[TIMOB-13232] Refactored unit tests
Merge pull request #129 from bryan-m-hughes/timob-13232

[TIMOB-13232] Refactored unit tests