Merge "Add waiters in access metadata tests"