Modularize Wikipedia handler for easier following of logic. Add one more test for Wikipedia.