Add choices parameters for scope creation with corresponding unit tests