Update and add to tests

Note that the BaseTestCase uses a transaction on the Civi database connection -- if you are testing pre-transactional wmf_civicrm, please comment out these lines.

Change-Id: I3478be6b7a1d7c8ddb92ccc47a01bc7af4e96dbc
Merge "Update and add to tests"