Fix tests to turn green.