Merge "Move API base out of admin test location"