FLUID-4907: refactored builder

Instead of having expanders for each constructed grade, will construct them all form a single expander. Updated the unit tests.