fixing test and impl. creating new delegation WIP