Move all of the tests over to use civomega code (for now)
Merge remote-tracking branch 'pudo/master'