Add option to specify test dirs

Rather than specifying only a basedir. Test dirs should be specified
relative to basedir. Still need basedir. basedir.