Added JUnit 4 and Mockito