* add custom component command improvements * fix test * fix regex to include both single/double quotes