FLOE-160: Fix test structures.