improve comments per Darius' suggestions
modify tests to reflect rewrite