Fix and add tests to Helix plugin

It should work this time.