Update TODO
Add test
Replace tabs with spaces