Add more test cases for testing all data types