add a new item to TODO, remove needless parts of test fixtures