Optimize for faster run (for test running)