Merge "Revert "Revert "Test that we can unwind framework code."""