removed exception handling in tests
Merge origin/master