Fix some issues in TestGetData