updated data types and associated unit test.