Refactored test so it's more DRY and also rearranged things so the test cases and configs are at the top of the file