Deleted shiptest.cpp and updated GridCellTest