added support for version 2 (not tested yet); validating content in version 1 test