Fixed the flaky Registrar tests.

Review: https://reviews.apache.org/r/18977