fix test
Merge branch 'refact'