Whitespace in -and/-or implementation and tests