starting fixing deadlock
Fixing tests
Turning on internal metrics