Change override constucturs to filter out wrappers

This is mostly cleanup but it does remove some unnecessary createElement at startup and it does provide better test coverage.