Cleaned tests Makefile and scripts