Improved TouchCommandTest