Add a Builder pattern and an unit test for it.