Rationalise tests. Allow string selector on command line