Fixes deprecation issues with helper specs