new file
Clean up tests.  Get tests out of main