Could you move this block to the end of the file, so we have all of the testenv blocks first and then the configuration for any apps at the end?