redefined tests for placing ships. Failing
corrected merge conflicts