add metrics and update test