Refactor corpus tests

Also ensures that all possible temp test files are removed

Use overriden run instead of skipTest (for Python 2.6 support)
Merge pull request #210 from cscorley/simplify_tests

Refactor corpus tests