Update tests with mocks