Fix jed
Update metric logging and test works