Remove old TODO
Update broken tests