Improved testing

This isn't a lot, but it gives us a place to start thinking about integration testing.