wrote additional tests, mostly in the "r" and "s" sections.
Merge pull request #39 from Apollo117/more_new_tests_three

wrote additional tests, mostly in the "r" and "s" sections.