Updated Makefile / tests to work with clang