Fixed not testing for exact match
merged conflicts on exact match stuff