Replace fixtures with factories