Fix tests on Ultra