Update tests for latest fish-tank