Updated JUnitTests

To be continued...