Fix tests
Clean up
Mess with makefile