Make sure mappings always is initialized
Add regression test for helper bug
Fix idnentation and comment
Merge pull request #1083 from Shopify/fix_mapping_bug

Make sure mappings always is initialized