Adjust acceptance tests so they do not inline body file control