[gh-312] Merging test into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1547 20a16fea-79d4-4915-8869-1ea9d5ebf173