Start on fixing test5 that has the URLs hardcoded everywhere...