Spacing fixes which are currently on-going and failing a bunch of unit t...

...ests.