Couple of enhancements for execute-test agent