Sentence fixes and tests