Improve test method performance