Revert gaia-mocha changes, and re-apply test-agent changes