fix builder
fix tests
fix tests
Merge branch 'master' into Builder_fix
Merge branch 'master' into Builder_fix
Merge pull request #1 from OpenClassrooms/Builder_fix

Builder fix