reorganize testing infrastructure
Merge pull request #19 from davidchambers/testing-infrastructure

reorganize testing infrastructure