Remove <optional-whitespace> rules

Add some tests