Merge "Further updates to the auto-test environment"