Test
Working one, added JUnit Test Cases