Bug 865020 - Update test-agent to get better edge case handling