Fix tests for changes in 2efb10f