Freeze introspector objects and use subsumation

Some updates to test framework