Adding more tests -- including some integration tests.  Woot.