Re-swizzled some scenarios

Re-swizzled some stuff:
- Replaced duplicate "When"s and "Then"s with "And"s
- Created more detailed scenarios (for Tomcat).  Hopefully this gives you some idea what level of detail works.  Also notice how I wrapped some values in quotes?  This technique simplifies how tests get written behind the scenes.  Basically, anything wrapped in quotes becomes a variable that get's passed into your test code.