Reorganize tests.  Work in progress.