394979 Fixing broken tests
5 files changed