Canonical tests fixed.