add some packages to the makefile
fix some tests that were broken from earlier changes