#1581 - Test updated for configuration and validator