Some tweaks, mostly tests.