Fixed jUnit tests.