FLOE-194: Added more unit tests.