Fix availability in new tests

Commit

3 years ago

Fix availability in new tests (cherry picked from commit fe26d150f668c745eaae0570a192eafc6716b449)