Avoid virtual member calls in constructor
Resurrecting more tests
Fix incorrect usages of AddAttribute
We are not running on Java for heavens sake
Fix 2 more tests