add test info
Merge branch 'dev'
fix conflicts