fixing elastic tests | adding X and W