added filter for svg fill-rule when value is nonzero, updated tests
combined if statements for verifying non-default fill-rule
removed superfluous parenthesis, fixed formatting
Merged paths