Continue work on JUnit Tests