inheritance fixes
only resolver is missing and some tests