minor changes: dsl api method return builder, updated tests to reflect the prev change