Remove empty lines
Remove WithBuilder from test side