Some quickfixes to JUnit test cases.