reworks tests for fish integration