Removed useless -r should in Makefile, renamed tests folder