Adding missing test case for builders
Integrating helpers developed in the DIVERSIFY/Disco code base