Unit tests fix after splitting parambuilders