Fix tests by making unique xqueue ids