Fix test cases

Regression from 807b8f7