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 dev into feature/208-settings-ui