Reenables tests
Adds hit order support to naval battles