I've added it before start writing tests as todo list and I'll remove it.
Could you also review this PR?