updated test + fixed builder fn