Updated feature matching to be a smarter interface and include unit tests

Change-Id: I1ae53729b6f3206f7a720aba06b31092192f8b22