Fix broken comments tests