Fixing a test that needed to be fixed as a part of the code fixes