FLOE-171: A few more fixes on unit tests.