Updated JUnit version and added Mockito