WIP: Get test-framework up-to-date with master

Work in progress. Will hopefully get it done this week.