cleaned up deps, bad test config, improved Makefile