less metrics logging during test
minor refactor