Rearranged tests; moved into new homes.