Rename "todo" to "working on"
Fix tests