NEW Unit Tests for modTFS

Unit Tests for modTFS, and some subsequent refactoring to support better
unit tests.
Removed unnecessary entries after refactoring modTFS