Fix the tests

Canonical is now a thing.