NXP-11261: cleanup
NXP-11261: split tests to easily test overridden contributions