Are we going to ever rewrite this test? If not we can remove this TODO.