Merge "Clear mocks in tests"