Data Type test case fixes.