Updated consistency tests and DataTypes.txt