fix for hanging  unit tests