Added test for merging of options