some JUnitTests fixed and updated