Added unit tests and multiple calls helper method for the builderfactory