reorganize, add some admin tests