Added another check to merge repeated constraints in the argument creator
Fixed mock problem in this test which was creating false 'valid combination'