More test coverage. Also spacing