Add tests of various broctl options
Miscellaneous small improvements to the test scripts

Also removed a baseline that is not needed.