Created some more mocks and stubs for unit tests