The TODO is not necessary because test stub already track it