HIVE-7068 Some more pipe to colon fixes in tests