Modified the expected inheritance output

Replaced enums by series of #define expressions. (Solves the tag
mismatch issue)
Moved some things around the core.