Fixing broken tests.
10 files changed