Fix comments
Refactor test