Fixing promise firing for metrics
Broken unittests