Admin test cases

Merging these changes back into the master