Added JUnit & Mockito testing