more modifications to testing environment