fix rest tests; fix COLL_MOVE_RENAME dump