Updated tests
Merge branch 'develop' of https://github.com/27cm/typo into develop