Refactoring and Testing my battleship code from phase 1