Changing test files to use mockito. Removing dependancies