ADMContr + tests refactoring (in progress)