Restructured the dependencies and unit tests.  Also made sure we pass string objects to the builder.