Switch to Factory for tests