Fix test and API broken