Fix the tests

See comment on line 278