Fix the tests

Fix the tests, seems to break in #1455 merged earlier today