Fix test to avoid constant folding
Fix function expand when module is not imported
Add missing combiners