Updated tests and added more mocks