FLOE-171: Fixed some unit tests.