Improve AugmentedTypeTest