Reorganizing tests and stuff.