Make a test member variable private.
Remove some outdated TODOs.