Fix mistakes made during manual merges + lint errors
Reverting this
DRY by including values from base class
Verify that base class is already included
Fix tests by loading class as a precondition on defines ; don't include coverage for the moment