Remove TODOs
Slight mod to data-point cache test