General clean up

Renamed some tests to reflect new class names
Removed the general returns.  Fixed unit tests