Various MSC2 fixes plus provided few test suites

Please review