Updated regex to allow whole parameter value matching with partial name.  Updated tests to reflect this