Improve comment
Improve unit tests