Upgrade tests
Update changelog
Merge branch 'release/0.2.2' into develop