In order to get #6 fixed, we'll need some good integration tests to check that things are working before/after.
