Starting changes for v1.1 to auto test Admin Tools