Fixes to /battle and /go

Also removed /battletest