JUnit tests redone for M10