Add clean function to makefile
Rename files
Rename test file