dcu_test fixes