fix builder bugs
Some test refactoring, more builders tests