More consistent punctuation
Fix tests to reflect punctuation changes
Merge pull request #355 from athaeryn/consistency

More consistent punctuation