total test refactor, moving things around, adding tests at all (duplicates of v2) for v3