Update tests
Rethrow only one exception