Refactored tests and class names.  I should not copy and paste!