Adapt tests to e2dc2acb6f967e2d7e572904d2f011906be8ca9b