added more factorybuilders and added tests for new classes and existing
classes