Activate some todo specs that are now passing

This PR activates some todo specs that are now passing.