Fix unit tests, ensure name is reset so later tests work consistently
Don't throw out error stacktrace, as it masks underlying error
Merge pull request #592 from tdonohue/DS-2080

DS-2080 Fix unit tests