tests pass with rust master now