Add tests
1.1.0
Merge branch 'release/1.1.0' into develop