Merge "Add unit test for data_utils"