Completed the merchant model and route testing to a large extent, and fixed up the update code. Completed the place model testing as well.