Forgot to update tests after changes in 481d89ad435