Stubbed out failing tests.  Refactored class names.