added a couple of wiki tests
Merge branch 'master' into kingman