Add todo to improve unit test