Fixed issue with non-lexical variable in base test, as well as uninitialized variable in catalog test