revised content and tests