Added JUnit test methods