Update all todo test to be 3.4.9 compatible

This PR updates all the outstanding todo specs to be 3.4.9 compatible. As it turns out some specs were out of date and have result in development of outdated/broken features. 

Luckily the feature weren't on hold til 3.1.next.