Increase memory for junit test run, fix broken unit test