Tweaked tests and comments for pull request