Charlene: Removing mockito as a dependency