Follow-up on reviewer comments and a tweak to a test