rhbz1101803 - fix TMX clear function

plus some other functional test fixes.

Should this target release branch or integration/master?