Formatting to 80 columns
Correcting test naming