Rename preferences per Sprint 36 release notes
Add domain support for error catching
Extend tests
Merge branch 'test'
Extend testing