Removed some disabled, unused code
Fixed text-tp2 API, and added tests
Removed some unused tests & code