Trimmed up whitespace
Added tests