Minor fixes based on feedback from @Infocatcher
Added (still disabled) tests for #256
Unformatted at the start of a new line should not add extra space

Fixes #285