fix wrong test and revert to normal calls