Reworked tests again to introduce simple tests that only check to make sure different origin URLs are handled properly
More test restructuring to consolidate origin and base URL information into one place