add a few more parts, clean up rspec for ship tests