[master 20/22] Fix some small mistakes in tests using availability information.