Merchant Tests and Class Updated

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
removed coverage