Merge "Fix and improvement for MsoBusinessLogic tests"