|#1034| +RahulK| FT code clean up, fixing tests