Updated the jUnit tests