fix tests according to the latest changes