adjust admin and cleanup tests