add integration tests to makefile
fix broken unit tests