Organize Makefile a bit more
Add some test files
Working on Makefile
Fix some tests