[v6r10] FTS fixes

This PR contains quite a lot of fixes for the new FTS system. 

It also contains some re-shuffling of the many test modules, and more should come.