cleanup tooling; add options to test program for output type, verbosity, tag and branch