Added input format for metrics. Store now has "batch" index and very fast "instant" index
Cleaning up dependencies in unit test