Propagate server errors to unit-tests
Merge branch 'dev'