Small tests and cleanups.