complete builder and add builder test