Fixed extra new line in surround block with relaxed newlines - fixed tests