Add support for testing of super types