Fixed tests one more time (broken in commit 518c97d9)