Incorporating PR feedback and adding an integration test