third metric + testdata + fixes in other testdata