Reorganized tests and routes.  Much more organized now.