fix tests
33 files changed