Test cleanup
More test cleanups
Permalink tests
Cleaning up permalinks
Merge pull request #6 from paul-christmann/master

Testing Cleanup