Global fixes and admin controller unit tests