fix(expression extractor): Fix and test