Fixed tests again (broken in commit 3343ebec)