properly handling non-v1, non-v2 paths
properly handling non-v1, non-v2 paths, and tests