Fix test cases
Merge branch 'bugfix' into develop