FLOE-116: Refactoring unit tests.