Updated JUnit Tests to Pass