PR feedback and test tweeks