Better test argument handling