Remove obsolete TODO.
Test case for PUB-860.

Fix typo in test case for PUB-860.
Test case for PUB-697.
Test case for PUB-636.