Re #10681 Modified MAPS system test