continue fixing test (model-common, expressions)..