Fix a test description
Remove blank lines
Merge branch 'dev'