B-53877 Updated tests so that they don't break