Fix a couple of broken tests, added a TODO.