address some TODOs and add another test