Added BattleShip tests and changed a few methods in Ship.java