Added test for battle and fleshed out battle more