I'm going to update this once the remaining blocker for 1.8 is resolved, as some of these test cases will need to be changed.