fix for hanging  unit tests
5 files changed