Fix some tests broken with last commit