Sucky/temporary fix for this test while we work on the 'right' fix