Extended tests to support cdv format