Fix tests, in worst way possible.