Note: I've made this more specific because the integration test doesn't seem to work.