refactored tests, makefile
clean