Improve default test options