testing fixes for Issues #7773 and #7774

Not necessarily intended for a merge...