Updated battle class and start of junit test as proof of concept