added makefile
Cleanup and separated integration tests