admin sapce refactoring and new tests