Introduced a builder to the mix.
Made a parameterized test.