renaming basePropertiesInputChoice to componentInputChoice
testing & cleanup of testing