Updates to add JUnit tests