[SUITEDEV-2114] Canonicalizer
[SUITEDEV-2114] not just aws tests anymore