For ENG-5256, I swear this is the last test that needs fixing