WIP: 26-integration-tests #35

Draft
Mr_Steppy wants to merge 16 commits from 26-integration-tests into master

16 Commits