5

Some fixes in JUnit test