Add todos for tests