Completed requirements and added mockito