updated admin, tests