running - junits to fix, metrics to refactor