Use mocks in tests

Write better tests using mocks