Fix tests for updated dependencies