Use evalExpr everywhere, various fixes, test execution too