WP-3531 Removing some testing stuff