More reorganization of tests.org