#3491 - Test fixed and config updated