Merge "Change tenant usage tests to wait until retrive valid response"