Small tests.

Nothing significantly different. Moving things around.