Adding more JUnit tests