Fix tests to new reality.