Removed Mains class.  Refactored tests. Tests pass.