final fixes for rethrow unit tests