Fixed failing tests for ship