(HI-289) refactor tests based on feedback from John and Kurt.
reduce windows conditionals and namespace use.
eliminate possible namespace collision with agent object.