Fix tests to match