Fix tests for format v2