Re-factored test listener.
Continued WP runner.