Clean up language, clarify priority of requirements

More emphasis on design element of test.