Test cleanup
More test cleanups
Permalink tests
Cleaning up permalinks