tests + fix merging params