Fixed some JUnit problems