First version of builder and simple tests