Fixes eway tests