fixed some more tests after EWYK refactor