Reorganizes tests