Minor comments, more test cases
Disable as unrelated