Get tests running again
Fix some of the semantics of class names, and don't use rails callbacks, just fire a single method; this isn't supposed to be that smart