latest feedback and add tests