updated factories to ensure uniqueness of each factory

updated factories to ensure uniqueness of each factory