Merge
Removed tests/metrics from vcs