fix MSnSet -> ExpressionSet and unit test