Updated for using ConverterUtil, and complete testdataset