Clean up specs related to broadcast builder
Add more constructor options for builder