Bug 911692 - Improve blanket-driver of test-agent