adding find by tests to merchant
merged conflict