Work on unit tests for battle system