Added methods and tests for Ship