Fix tests
8 files changed