Try fixing tests
5 files changed