Fixed test, additional JUnit test cases.