Unit test adapted