Improve builder API an tests