SFM: Removed deprecated methods
SFM: Fixed matching test code