Updated spec to cover v1 **and** v2.