Test fixes and rebase conflicts
Test fixes and rebase conflicts

pshc/rust,GBGamer/rust,GBGamer/rust,dwillmer/rust,aidancully/rust,pshc/rust,pshc/rust,dwillmer/rust,pshc/rust,aidancully/rust,GBGamer/rust,dwillmer/rust,graydon/rust,graydon/rust,GBGamer/rust,GBGamer/rust,aidancully/rust,aidancully/rust,GBGamer/rust,pshc/rust,dwillmer/rust,graydon/rust,aidancully/rust,pshc/rust,aidancully/rust,GBGamer/rust,dwillmer/rust,graydon/rust,dwillmer/rust,dwillmer/rust,GBGamer/rust,graydon/rust,graydon/rust,pshc/rust,pshc/rust,dwillmer/rust