[master 16/17] Fix some small mistakes in tests using availability information.