FLOE-116: Refactoring unit tests.
Merge remote-tracking branch 'justin/FLOE-116' into FLOE-171