fix test issues with equinox