[BZ 1124614] a few more fixes to merge this change in:
  - fix erroneous comments no longer needed.
  - update unit test for AgentSupported[Build|Version]Test checking.