Added some new unit tests for movement, started mocking combat