fix tests, prepare for dart m3