Add an extra foriegn key scenario for #5
Update matcher to use explicit column names in default index key name for #5