WP-2919 Small changes related to testing results.