Ensure DelegateTest class meets expectations
Simplify Delegate greatly