Fixed up some tests, added some todos