Add a TODO back in for some tests