Change deleg tests to rely on serverhelper for conflicts when possible.

Signed-off-by: Jeremy Bongio <jbongio@us.ibm.com>