Rm TODOs introduced in r58756, Avar had a bug with SVN updates, causing this test...