S569498: more improvements to the RMPB testing