Removed a bunch of internet copypasta, tidied up tests
Stubbed out two more 301 redirect tests