Fixes tests that broke on figgy 2.0.