Adding Creational / Builder impl and test