Fix tests for 4bbee3f