adjust admin and configuration, and cleanup tests