whitespace cosmetics [#2146]
fixed two extra tests [#1661]