Added canonicalization of values for integration tests