Another cleanup
fix a bug with helpers and add a test for that