makefile removed and integration tests added