Comparative noise measurements in YBCO step-edge and bi-crystal grain-boundary junctions