Update makefile and tests.
Update Makefile.  Now have dependencies working.