Cleaning up java unit test template