Provide namespace for unit tests, update error testing.
Merge branch 'unstable'