add merchant tests and functionality
Merge pull request #31 from bryceholcomb/finish-repo-tests

add merchant tests and functionality