Fix test
Merge
Remove warnings of SAFT generation