Re #10532 Minor modifications to fix system tests