Refactor
Change test code
Merge branch 'dev'