Dart M3 related changes and test fixes