Merge "Clear test user registry between tests"