Removed obsolete TODOs.
Added 3 missing unit tests.