Update to track wikipedia changes (again!)
Added integration tests Closes #15