Clean up some todos in tests around metaproperties changes.
Merge remote-tracking branch 'origin/metaproperties' into metaproperties