Zip zip longest range test refactor

Lifted out common logic in test, reducing length and increasing maintainability. Tests were also moved into folders for ease of use.