Add namespace and update shortcode tests