Acceptance tests/master/do not merge

Don't merge this.