Putting the test back in and fixing it up a little. Also small defensive change in ERR_Handler.
Merge pull request #211 from SalesforceFoundation/feature/198-put-test-back

Putting the test back in and fixing it up a little. Also small defensive...
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into feature/202-more-error-info

Conflicts:
	src/classes/ERR_Handler.cls