Rename test files to keep naming convension
Also added missing .msgpack file dump for new with-merges repository.