extra tests
Merge branch 'develop' of https://github.com/mikera/matrix-api.git into develop