Refactored ship subclass tests