Move helper functions to Helpers and enrich helper spec