- Add v6 and v7 as valid options - Add unit tests for generating and analyzing all supported versions