Fix tests to maintain compatibility