Update the PR based on Code Review comments, and additional tests.