admin test fixes