Refactor org tests to no longer use old handlers
Refactor org tests to no longer use old handlers

Signed-off-by: Corbin Halliwill <38cf05332854d0c00b392ad9da3fb5cec295aa83@pivotal.io>

hyenaspots/cli,simonleung8/cli,markstgodard/cli,markstgodard/cli,simonleung8/cli,hyenaspots/cli,fujitsu-cf/cli,fujitsu-cf/cli,markstgodard/cli,fujitsu-cf/cli,markstgodard/cli,hyenaspots/cli,hyenaspots/cli,simonleung8/cli