fixes fixes for naughty tests.