Moved testing setup into its own directory, and added medium tests.  This is not pretty, but its better than nothing