Sorted tests and removed unneeded ones.