Hotfix: Tests which raise exceptions did not successfully swallow the exception
Merge branch 'dev'