moving test builder into builder