Fix comments
Create tests
Merge pull request #1 from asgoodasnu/WK-581

Wk 581