Small fixes to PR and test case.