Added some unit tests that were missing. Updated TODO.