Merge "Add admin api tests for project-id"