Added some new JUnit Tests