add merchant tests and functionality