Move some tests from the old structure to the new more descriptive test suite. Remove them from the old lists.
Stephen Williams