Some refactor and more rewrite of TTT to follow some better practices
and achieve much greater test coverage.