refactored the tests for ship creation
fixed merge issue