Add 'make test'
Use varToCoreExpr instead of explicit Var constructor to build variables.