Fix tests so they are fine breaking.