Add more metrics, tests for search-cross-checks. Close #205, close #206.