1.0: swapped around a few sections so that tests make more sense.