remove unnecessary http instrumentation of tests
fix integration tests to use metrics v3
fix NPE