Add test modules
Merge branch 'master' of https://github.com/scottcorgan/into