couple of spacing fixes and more in the testing.