Switched the order of TEST_FILE_DIR and VALGRIND_ENVIRONMENT in order for TEST_FILE_DIR to be visible in valgrind builds. Cleaned up the code for file path resolution in file_parser.cpp