Cleaning unit tests and makefiles