Fixing the failing tests. DHH-107