Products: Testing and addressing PR comments.