Further updates to the auto-test environment

No match.