Updated functional tests
Release 1.0.2
Merge branch 'release-1.0.2' into dev