Fix tests
6 files changed