Added failing test
Fixed failing test for #1186
Replaced string.Format with string.Concat
Added Given, When and Then to tests