Unit tests, baby.

Slightly reordered files.