Added more tests
Merge branch 'wikidao2' into wikidao
Fixed some code review issues and added support for WikiAttachmenthHandles