Fix tests for rust upgrade