Merge "Fix broken tests"