Corrections of JUnit tests

All tests passed now.