Adds more TODO coverage