Validate fixes.
Split out v3 tests and add a bunch.