Add delayed/instant testing