Fixed most data transformation tests