Updated tests and added new mocks