Fixed up tests after TODO