Added comments. Renamed agent to agentTag. Re-ordered tests. Bug 1320543.