Refactored Ship Object. Also refactored the test case file accordingly