added mocks, fixed broken test because of