PDB-341 More work to add tests and get this working

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-341 Ensure v3 has the full coverage that was never copied from v1/v2 and ensure all tests pass

Signed-off-by: Ken Barber <ken@bob.sh>