fixed tests broken by delegation support