Fixing tests
Turning on internal metrics