Fixing spacing in tests and adding some whitespace in the source, otherwise no code changes