merge test labels

that way regexes can match them.
add ability to add arguments to test