Mocks, initial work on tests.