some tests, and config cleanup