Added some mocks & tests