Merge "Fix communal hub tests." into main