Fix tests, take 2.