JUnit tests added