Minor fix for broken tests.
Minor fixes that were pull requests on the main repo.
Trying to fix more broken tests.