refactoring tests
 more refactoring
 ships get stranded now
 stranded with eta