Rename test subdirs