Whitespace changes and some new tests
additional tests and few changes - restore earlier clean