Added tests and updated the config.yaml with regular expressions