Add an introspector
Fix tests