Re #10559. Fixing usage tests.