Fix tests
4 files changed