Added @if test case, fixed issue with line-breaks and spaces