Correct path to executable in valgrind test
Corrected merge errors