Refactor tests to update for static Builder.copyOf