Merge "Fix broken test"