Merge "Improvements on testAdminActionBookkeeping." into sc-dev