Fix the tests with the named id_ arg