Fix tests.
Move stuff around.