Updated TODOs
Added docstrings to test methods