Some tests,
Merge branch 'develop' into infotest