Fix some faily tests.