Fixing more test fails.