Updated JUnit Tests