Added tests for BuilderFactory