fix delegation; all tests pass now
rename test cases