Fix tests for previous change