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