Fixing broken tests (DHH-557)