Update for PR comments
Fix test breaks