SFM: Fix test cases