Change enricher builder setup for Jenkins
Test updates for Jenkins