Fix tests for new version decl version class