Just to be thorough, got an integration test for #154