Merge pull request #55 from Sourceless/master

Fix and add tests to Helix plugin