ENH: Clean up test argument handling, close CDAS connection on success