Removed depracated 'test-battle' target

- Also renamed 'test-main' to 'test'.
Removed unneeded '-test' target
Reorganized build script
Added JDK selection to the build script