Fixture fix for admin test cases

    * Fixed review issues

Change-Id: I0fa60ed5e21ed3b13ef8143baf98b863a2cff334
Merge "Fixture fix for admin test cases"