IDataTest fix