Adapt test to new developement