Fixes up some v7 failing tests.