More tests and test cleanup.