Tests! and fixes to ship_instance methods