Started using factories in tests