Fixed customer tests...

  refactored how ps_object classes are derived.