Move tests to seperate folder and add Makefile