Merged back in changes for test_data type handling