New tests environment

Using the same text as #469 but now merging to the right branch.