Adding the ability to edit test labels - rebased commit

This is a new PR with all of the commits squashed and rebased against a recent master.  Hopefully it will merge cleanly!