Some more tests and other cleanup.