Got the basic structure in for the other tests. Wrapped up Merchant Tests as much as possible for now (without password testing).