Reorganized some tests to accommodate testing website

Put all direct children of a category at the top of the list instead of
having it interspersed.