added support for version 2 (not tested yet); 

also validating content in version 1 test