Fixing a couple of tests
Commenting out a few assertions

Deprecated, as these assertions are left over from trying to get
attribute removal to work as expected.
Fixing one execution test
Updating a couple execution tests

And updating regression data as necessary.