More improvements, added universal performance tests for snapshot and tags