Updated tester
fixed conflicts