Tests fixed
6 files changed