reverted whitespace stripping
fixed tests