Move tests around a bit.
Various improvements.
Minor.