Move tests in separate folder
Update tests and make them pass
Integrate new tests structure into Makefile