Remove empty lines
Merge branch 'unit_testing'