Add more tests, with mocks