fix requeuer and update tests