Make passing/failing step slightly more flexible.
Tweak description, simplify step definitions.
Tweak, correct descriptions.
Add self-tests for directory-layout variants.