valgrind includes and tests removed