Updating TAP test handling