Update tests to run with recent changes to datamodel.  (Mainly removing the demographic data from dataset.xml.)  Also update the email settings to
Changes tests to assert equals
Merge remote-tracking branch 'origin/release' into develop