Added some more TODO

Test Framework