Move title to object, test to completion (and add a todo bugfix)