Test have to be modified as well