Make separator a default builder option

Update tests to reflect new options