Additional changes to the unitests for admin api and utility class