TT Improvements: more tests passing

Working some more on this during class.