More fixes from troubleshooting test execution