Remove test-plus from defaults.