Fix test
Merge branch 'fix_test'