Phpunit tests shortcode diff

Diff is against trunk.

phpunit_tests_shortcode.diff