Added data formatting for 9 data types including tests.