Wrote Merchant tests

also removed old obsolete tests and started a more robust Exception structure