fixed test codes
Merge branch 'develop' into release