replace more factories with fixtures