redone project tests with mockito