Updating NDT tests

Remove the ones that assume asynchronicity and
add a placeholder for the timeout.