Inaki makefilefix

Cleaned up the Makefile and renamed the tests directory to test.