Add TODOs to the test