Fix tests to match compiler