FLOE-116: Refactored tests