fix failing tests
7 files changed