In the end it wasn't correct to change from using the workspace name,
but I made a couple of improvements - use the InstrumentValidator and
improve the test and make it more efficient.