Merge pull request #430 from leider/master

wiki tests, small fixes and cleanups