Pass unittests again
Fix
Fi
Add TODO