Removed comments and extra line breaks
More tests added