Support subdirectories in the unit tests. Also, reshuffle some of the existing tests into subdirs, in case they belong together.
Support subdirectories in the unit tests. Also, reshuffle some of the existing tests into subdirs, in case they belong together.