Created unittest inside this commit