Updated to include default test options