Merge "Fix valgrind tests"