First test added
Clean up
Formatted code not to be wider than 70 columns