Cleaned up code
Better test names
Merge branch 'issue-1143' into more_tm_tests