Merge "Perfprofd: Fix tests"