Started on the Merchant Model tests: should be done by tomorrow afternoon with the model tests.